Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 15 Apr 2010 22:47:23 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 15 Apr 2010 22:47:23 +0000 (22:47 +0000)
commit2f1f788edca83312cc0fb901c2f256debd15b2e1
tree36a648ffeb97ee9989641730276c763d7641903a
parent067ef71fcb987cad1f73e505fe63e378be7741a0
parentb01f496a964e0b26c4c3df2ce8c41d41803ab441
Merge from mainline.